A bit of cleanup
Addign some comments and cleanup