Cleanup for better legibility.