Stylistic fixes and switching to softtabs