refactor bloat