minor cleanup from last commit