performance update

some addtional code clean up