Format code and few comments