Applying houndci and Andrea suggestions.