format tweaks
Merge pull request #1481 from pennij/mymaster_fri0705

format tweaks