Reduced some code bloat