[cleanup] Simpler code