Refactored existing functions into semantic groups.