Refactor to make names more clear