Tidy up issues with code blocks; add line length limit