Removed unnecessary booleans