:+1: for this refactor