moving to <> operator in java 1.7, also reformatting long lines