refactor and cleanup assertion toolkit