Cleaned up logging a bit