Misc tuning
PSR2 - using jetbrains this time