Minor style & superficial changes