Initial checkstyle integration

Mainly whitespace fixes, and import reordering