Clean up the CRUD handling and pretty up the CLI