Simplifying component
Adding early exit
Updating tests
Removing unnecessary serializer
Removing unnecessary initializer. Renaming service.