Fixed issue with inconsistent colors from previous fix.
A line outside an if statement needed to be inside it. Also was able to get rid of a method call.