Fixed checkstyle (whole repository) MERGE THIS