I think this code clearer