more reformating and cleanup
Merged 'master'.