PS: not something you need to change on this refactor, but definitely something that I would consider in the future.