[WIP] PIM-3535: enhance updaters controls

This is checkstyle but be consistent in blank lines :)