continued code cleanup on operations (+-*/%)