Cleanup k-factor
Fix bachelor hypothesis for new k-factor modes
k-factor: simplify dealing with mass hypothesis