cleanup and formatting for PSR-2 standards compliance.