flax

3813d3c5 - Apply suggestions from code review