Cleanup

Added comments and removed some unnecessary code.
More Cleanup and Commenting

Removed some hard-coded values and added lots of comments and removed
unnecessary code.