clean up
DRY up Create action