Original commit, changing indents, etc.