refactoring java 1.6