[issue #7] Brought codebase inline with PSR-2.