Refactor status line