Some refactoring
Remove tab