Attempt to fix formatting issues