Cleaned up code for Scrutinizer