Refactor per style guides [skip ci]