Minor code clean up