small cleanup and update