Squashed commit of the following:

commit c2745e9a14e2518f3ba215f380a81a8f3acd8e28
Author: JBaltika <jim@genuineinteractive.com>
Date:   Sun Dec 1 23:15:23 2013 -0500

    Code clean up