Some minor Performance Improvement