Small formatting fixes and actually use context for dealldated