Modified and removed unwanted statements