added comments and cleaned up