Merge formatting changes with personal github