Some code comments & cleanup