I see nothing wrong with that code (well, except for some of the PBP-induced madness). Anything you do to "fix" it is going to make it more unmaintainble.