refactory
java 1.5 -> 1.6