[Finish #66078552] Condense code