Cleanup and add more descriptive text