Cleaned up class and extracted a few methods
Authored by: dcaffrey 2006-07-10
Parent: [r510]
Child: [r512]
