Fixed some formatting issues and got rid of some residual merge comments