I think this adds readability. Changed the fact and rebased on current master.