Refactoring. Also added commented out delete and move operations