Refactoring and slightly improving speed