clean up and specify expected end user interface