syntax cleanup
Merge branch 'refactor' of github.com:jamesrobertlloyd/gpss-research into refactor