Refactored Class Structure, Implemented Remove and Reset.