Minor changes on one class - commented a few debug lines out