A lil cleanup