Moved autocommands into augroups