Fixed up some style/consistency issues in the code.

Including: consistent spacing in method signatures, line lengths <= 100
cols, consistent comment style, removing unused method and property.