made it less redundent