small performance improvements
Small changes