cleanup and take care of a consistency pet peeve