minor cleanup, remove extra }, fix  duplicate