Cleanups to input