work on implementing PSR-2 standards