more factoring
polishing pass