[GOZ-17] Meet psr-1 requirements