Not scope of this PR. 
This or others, there are a lot of similar things to change. Left it a checkstyle related PR.