Use variable, not repeat copy of string
Merge branch 'master' of https://github.com/IanDarwin/javasrc
Indentation repair