ported to jdk7, inspections+clean