removed trailing ampersand and cleaned a couple of things up