General item code cleanup, pt 2