Commented Code, Clean-up