Comment, format, test, and fix