Small clean-up, added better naming.