Fix typos and tab inconsistencies

You may want to test this before merging.