Webstorm Cleanup