Cleans up the renderer further.
Adds line numbers check.