Jeff - eliminate 2 bad smells