Did a bit refactoring, mostly tried out eclipse features.