adjusted formatting issues