Starting a small cleanup