removed comments and changed some things