Source format and reorganize import
Don't create a HashMap. We only need a singletonMap