Style improvements
Moved endpoint serialization