Added calls to String.format