Add a UI package
Make helper class final and non-instantiable
Clean a bit