Update to simplify even more
Update to better name and namespace