Apply fixes from StyleCI
Apply fixes from StyleCI

GeoffreyDijkstra/spotweb,mesa57/spotweb,tswestendorp/spotweb,GeoffreyDijkstra/spotweb,tswestendorp/spotweb,Spotweb/Spotweb,mesa57/spotweb,Spotweb/Spotweb