formatting issues adjusted