cleaned up some comments and logging. -James
minor refactor. -James