*Small cleanup