Refactoring and cleanup
Clarification