make use of Java 1.7
moved method
organised imports
moved method