Rewritten structure for PSR-2-code-styling