tiny Java7 and comment cleanup