Fix compile warning
Include a new user method getDisplayName()
Tidy much of the code to conform to checkstyle.