Fixing checkstyle and cleanup
Creating serializers for child elements. Fixing a few things