Just a bit of code clean up

a bit of code clean up