Tighten up attribute syntax