Tyding up logging a bit