Performance improvements

I moved request name construction for mappings into Injection Point construction. I also removed some defensive code in mappings to avoid conditional.
Fix indentation.