Build cleanup & checkstyle

Or any similar ones, they're formatted for readability