Made some changes

Have a look!