Update Faker to latest version
Clean up code