Clean up and fix comments (nw)