More codebase standardization following PSR