A bit of refactoring for better performances