Another small code clean up