Refactor
Improved naming