Fixed formatting issues 1.1