Clean up

A little code clean up, and commenting