Some minor style changes to emit functions