Simplify logic in interface.