Cleaned up CRUD functions