Fixed some poorly indented method definitions.
Reorganized some code.
Removed extra semicolon.