lil code cleanup