improve DRY in awesomedrive