Clean up comment and if statements