Cleaned up debug code and extra comments