Switch to using line indicator
Cleaning up