Just some code clean up