Conform to style guide, #466

This results in an empty checkstyle report. I'll do the wildcard imports separately.