Fine tuned checkstyle.xml with Chris.