formatting
Merge branch 'puma-strategy'