Code cleanup. Less duplication is good.