cleaned up bloat