Added support comment, refactored slightly for increased readability