Fixed multi-line rendering and code cleanup.