Minor clean up
Optimizing and enhancing UX