Refactoring some member properties
Merge branch 'master' of github.com:malariagen/PfCrossesWeb