few performance-oriented improvements