'Namespaced' functions and variables, removed a few superfluous echos