Refactored to make sure of string formatting.