Small cleanup #37