Source format and reorganize import
Don't create a HashMap. We only need a singletonMap
Merge remote-tracking branch 'upstream/issue101' into issue101