Tweaked statusline
Clean up