text != test
cleanup, relocation