Stylistic fixes implemented.