Commented some code
Tidied some code