Moved a static map attribute to the xml configuration. Also did some code reformatting.