Code clean-up is done
uri bug fixed during installation