Cleaning up the input section