:+1: to the refactoring