Change whiz to wizz; refactor code slightly