Clean up code to be easier to modify/read for additions.

This shall only be a code clean-up/bug fix milestone. If any features are to make it in, it will be minor and add only optional capabilities.

Pushed out to 12/31/2012 - Needs planning on code clean-up.