More minor cleanup to make things more ruby-ish