Feedback from jsorois with formatting