Some performance clean-up