lil code cleanup, part 2