Refactor Functionality
Add more notes to ReadMe