Code Clean Up

Some general cleanup of the code-base. Generally speaking:

- Basic code-formatting for consistency
- Removing warnings
  - Removing unused local variables
  - Supressing warnings were necessary
  - Adding type-parameters to raw types
  - Change access patterns (this -> some classname for statics)
  - etc.