formatting fixed up