#1 more code clean up