minor refactoring, most beautiful !!