some cosmetic changes for server component
some cosmetic changes for server component