a bit of code clean up