Code improvements through checkstyle.