Use more hyphens for consistency