Cleaned and Improved Input