Refactored most helper methods to be placed inside of model