Added a anonymous inner method to promote testing
Adding methods to test remove and save