Fixed some formatting issues
merge