Minor update, just some code clean up