Use new string formatting
Clean up TODO
Fix bug: string format
Merge remote-tracking branch 'origin/master'