Still small cleanup