tab + spacing refactor