various fixes and reformats
2 files changed