Improved logging and readability.