Started Refactoring

Fixed a lot of commenting inconsistencies
Still going.
Some function names have been changed to make them more intuitive.