Added input cleanup