General improvements and refactoring
Update Readme