Minor code clean up after merge