Fixed comment
Removed unnecessary checks