Better factoring of hipchat