Removed unnecessary boolean values