tighting up logging