Small cleanup, seems working ok.