Cleaning up more input