Fixed checkstyle bugs