cleaned up checkstyle errors. Build now breaks on checkstyle violations as was intended.