(/=) enforce more immutability, clean up