Reducing JDK requirement to 1.5
A little code tidying