Refactor to DRY and push shortcuts into data