minor performance enhancements