Code update

Some code are updated and error are removed