Small cleanup on base