Add lightline
Refactoring