1) Cleaning up my formatting with namespacing