A little bit of code clean up