Renaming guides
Minor formatting updates