some cleanup work with tj