Performance improvements - Refactoring