Fix/style optional maps 54

Branched from #27