Refactoring
Fixed typo
Cleanup