Slight speed optimizations

(Styles dont recalculated quite as much)