Cleaned up.
Namespaced.