Java refactoring Created Serializers and modified code to use