Speed tuning
Refactoring