Minor additional clean up