Whoops, missed some stylistic changes.