Cleaned and Commented