refactoring - DRY
target blan & formatting