I don't really want to touch this code (other that what I have here) until I fix the main issue described in the comment above. I have no problem making all of these changes there. The bigger issue here is that this is currently causing duplicated content and I want to get that fix out. Most of the clean up you are describing here will be quick, however getting the justification stuff to actually work will take a bit longer (and is not really in the scope of this ticket)