added comments and cleaned up a little