Restructure and small typo fix