Small cleanup of stuff