Fixing Inputs and CleanUp