refactor(model): Fixing more issues for code climate