That's definitely a more sensible way to structure it. I can't remember if there was an actual reason I did it this way or if it was just "get this working and clean up later" that never got cleaned up.