Formatting

Ran this repo through auto-format in IDEA. Cleaned up imports. 

cc @adamcataldo