Switched to using yoda expressions