Fixed tabs
General refactoring