Removed serializer that was done as a test.
Refactored code to have cleaner les cluttered code.