Simple code clean up