Code cleaned and ready for submission