Format and comment refinement #73