Eclipse compiler version fix
Some refactoring and cleanup