Moved to Java 6
Code formatting
Code style & exception handling