Making small optimizations
sync