Object Oriented malpractices fixed.
Readability improved.