Some minor code clean ups.