Missed some code reduction