Minor additional cleanup