Refactoring form serializer