Changed some of the commenting that got refactored wrong