Naming consistency
Inconsitent naming
Change formating