Small cleanup from last commit