Update CheckStyle, Refactor