Fix {} and initialize Mapping

Some formatting fixes, and comment normalizing.