A bit of code clean up