Address feedback
Refactoring