antonhornquist cleanup and add a comment