cleaning up user experience