cleaned up inputs
cleaned up inputs