cleaned up binary expressions with decorator