Some tab cleanup & typos