more sudo factoring
cleanup