Cleaned up property definitions
Merge pull request #15 from jtmilne/master

Cleaned up property definitions