Github style, basic cleanup.