Simplify concern
Fix formatting