Little code clean up