descriptor code cleanup for readability