Clean up for better documentation