Reindented, like you suggested.