Removed unnecessary booleans.