Change to use an instance instead of a static
Code cleaning