factor code even more.