Refactor to standardize class names, added return type to the remove functions