Code Formatter

Clean inconsistent naming and apply common web development naming conventions.