Just some refactoring
Refactor statusline