Improvements to match the corporate standards (as per the "thou-shalt-rules" from the Chief Architect)

minor improvement to make this look more enterprisy