Cleaned up and move FormatWrapper from the experimental package to base