phpstorm code cleanup