Fix formatting issues