Common optimizations

Glad you got it solved! Thanks for following-up.