Remove commented out code
Condense two lines into one