Made a little cleanup