Fix to return true if color and pixel are already the same
-some code clean up as well