Refactoring helper methods. :ear_of_rice: