some refactoring and new i3status