cleanup more rubyish