PHPStorm reorganize and cleanup