cleaned up logging in