tried to fix formatting issues