Minor refactoring - PSR-2 + modern array syntax + complete phpdoc for funcs