Update readme and simplify some stuff