Clean up and additional functionality for multiple user entries