Fix formatting problems
Merge