remove some commenting and slight clean up for evaling functions