Rewrote for consistent use of equals operator