Coding standards update to original patch

Updates following comments by franzliedke