Handled all the suggested issues