Some cosmetic changes

Looks better and still works.