Started fixing some checkstyle