Small changes. delete unnecessary variables