really cleaned up internal crud operations