Clean up some names and documentation