Improved code to be more functional and easier to understand.
Added mode comments.
Authored by: artes 2012-08-15
Parent: [r5432]
Child: [r5434]
