Fixing some strings and remove a double of a function.