Updated readme
Renaming and comments
Optimize imports