Removed useless code & fixed label