Cleanup + better indicator for long lines