Cleaned up some code, still fixing serializers