Clean up code using Setoid properties.