PSR-3 fixes plus added move