Sure, although it's definitely a B-grade refactor, for now. It could go at the bottom of the list.