Minor improvement on Inputs