Remove boilerplate nobody cares about
Remove whitespace
Reorganize privates