Adding comments and removing unused namespace