Repeat command efficiency

Just a quick bit of efficiency + code clean-up in the Repeat command