Tiny embassy refactor

Gotta keep that main function clean...