cleaning and beautifying also check with timeInput