Fixed slight typo

Also some cosmetic changes