cleaned up and made pretty operator/mod