Few unecessary lines of code deleted