Preparation for DRY:er code