Clean
refactoring