Tidy
Typo
Change method names
Update for method names