virus code, release 7: refactor!