Changed name of package
Removed some unnecessary lines