Modified some names, removed some codes