Refacter per style guide [skip ci]