improve namespacing, whitespace