Remove overhead
Refactor