follow a little more PSR2

waiting for a proper refactor