Update readme
Update requirements
Common code cleanup