Updates Readme and a bit of cleanup