cleaned up some phpstorm warnings