finish fixing formatting issues