refactor(model): Refactored Model Class to get rid of D on code climate