Clean up code using Scrutinizer CI