Undo changes to xib since I'm not sure why my IB changes <archive> element to <document>
Undo whitespace changes Xcode automatically did
Make diffs smaller and style cleanup