Clean up some stuff
Add some comments