Drop some old style definitions
Prevent redefining built-in function 'format'
Cleanup
Merge branch 'develop'