Applying houndci suggestions.