PHPStorm Code Cleanup