minor changs made code more clean