Checkstyle Push

Ran through everything in Checkstyle- Errors are mostly false positive
indentation ones