refactoring lightline