Refactoting to use augroup