cleaned up some code, removed some debug statements that were lingering