More cleanup/generalization