Cleanup: use correct format strings with String.format()