PSR2 code style issues fixed.