Clean up properties

* Remove excessive whitespace, semicolons
* Prevent the properties from jumping around by giving each one unique
ID
Merge pull request #724 from robotboy655/master

Clean up properties