updated formatter and constants