Code style fixes PSR2