Clean up some usability stuff