Clean step : Adding few comments and cleaning classes and assets