Working to make code less redundant.