Wow, what a fun refactor