'Namespaced' functions, removed a few superfluous echos