reduced some bloat