Some cosmetic changes

Add some cosmetic changes