remove return, use non-comma expression instead