Just doing some code clean-up and adding more helpful comments