Applied PSR2-code-styling