Code Clean-up

Minor code clean-up and commented out Debug and Print commands