Clean up and format for github