refactored eclipse plugin