added comments and cleaned up a bit