Small cleanup, no change in functionality