[SUHET] Little refactorings at code review ... make code compatible to Java 1.6