code cleanup on operations (minor)