Change default placeholder to undefined; simplify