Update DRY up the code