Trivial formatting fixes
Quality improvements