Some minor code clean up