updated syntax, removed cruft