[cleanup] Better names
[cleanup] Use existing helper method, use StringUtils, removed unused method