Merged changes to get us on same page

Pull request to merge formatting changes and sync our repos.