Removed unnecessary type control
Fixed package name