Fix spelling and long lines