Squashed commit of the following:

commit 2a0a71e96ac72943b2c3f0201ca0fd23afe09146
Author: JBaltika <jim@genuineinteractive.com>
Date:   Sun Dec 1 22:45:07 2013 -0500

    code clean up

commit e7a8d569a214dc45cee05151d6deb40a181fb510
Author: JBaltika <jim@genuineinteractive.com>
Date:   Sun Dec 1 22:42:04 2013 -0500

    Code clean up