Make code clearer