Making this more idiomatic..I think