Cleanup

added some comments and cleaned up a little