code cleanup

Especially whitespace and indent issues.

Also removed a duplicate property declaration.