Added comments/finalizing/cleanup
Removed commented out code