Wow refactor! :new_moon_with_face: