Format code
Use getInstance() instead of new