Automated code refactor: PSR1/2