fixed PSR2 code-style issues