Finished fixing of webstorm detected issues