Polish initial CRUD routines