Removed whtie spaces and changed boolean statement