Removed all check style errors.

There were a few small bugs removed as well, mainly broken if statments due to no braces around if statments.
Checkstyle has been updated to be correct for my style.