Couple of minor code clean ups