Commenting and debug statement clean-up