Refactor code and remove autocommands
Add the bang