Incorporated some of Roger's comments
Incorporated some of Roger's comments

ekamioka/gp-structure-search,jamesrobertlloyd/gp-structure-search,codeaudit/gp-structure-search,jamesrobertlloyd/gp-structure-search,codeaudit/gp-structure-search,ekamioka/gp-structure-search,jamesrobertlloyd/gp-structure-search,jamesrobertlloyd/gp-structure-search,ekamioka/gp-structure-search,ekamioka/gp-structure-search,jamesrobertlloyd/gp-structure-search,codeaudit/gp-structure-search,ekamioka/gp-structure-search,codeaudit/gp-structure-search,codeaudit/gp-structure-search