several formatting changes
fixing merge conflicts