Cleaning up code to get better Scrutinizer results