Code organization

Formatted code nicely
Removed unecessary commented out comments/code
Code cleanup

Removed unecessary code/comments
Modified comments to be more descriptive
Code cleanup

Removed/modified some comments