A Lil cleanup