some syntactic sugar

used some for expressions (that I just learned about)
used withDefault in Maps