Fixing stupid typo
Lots of reformatting and renaming best practices