Clean up statusline code