Refactor collection create and delete