Complete cosmetic/minor changes