Clean Up & Documentation
Refactoring