Added formatter to mappinf and style fixing