Bunch of reformatting. Also updated feed model.