Code cleanup, phpstorm