More minor code clean up