Reverting changes and moving format into font namespace