Cleanup some Ruby code

Change-Id: I137483e68c068f97883d84de88636f7bb897ca78
Merge "Cleanup some Ruby code"