resolve formatting issues