Code style fixes

PSR2 code style fixes