Cleaned up logging a bit more