code cleanup part 2/2