incorporating checkstyle, fixing checkstyle violations