Update readme and more cleaning