Cleaned up code

Cleared commented code / Added comments for new code