Refactored inorder to use the Eclipse way ;-)