Cleanup per #ruby suggestions