Clean up of missed sloppiness