Code clean-up

Added some comments
Cleaned up the code a bit
This and that