Initial add of checkstyle, and subsequent partial cleanup of code.  Not failing build for now for checkstyle violations