Re-order things to put cocoapods on top and typos