Checkstyle and general cleanup