Squashed commit of the following:

commit 9fbb51db9fb999748ea29f97724601375ed6db33
Author: JBaltika <jim@genuineinteractive.com>
Date:   Sun Dec 1 20:43:07 2013 -0500

    code clean up