removed comments and a strange condition