small cleanup and comments