Removing need for helper functions