Fixed up checkstyle violations