removed some ruby-isms (for now)