Just refactored ;-)