Did a slight optimization.