[Singleton refact] - Cleaning code

- Cleaning the code of the Singleton refact