Readme and refactored code