Did small cleanup