space-to-tab edits and light refactoring