Refactor with better wording and simplication