Nice refactor. :+1: