Removed boolval use