Refactored eclipse templates