Made some change pointed in review
put some duplicates together outside of CREATE and DELETE