Move to string format instead of old % format