A small cleanup and comments