Squashed commit of the following:

commit 61eb6296cb7a4008f67fe8d689523fe16e3d41b7
Author: JBaltika <jim@genuineinteractive.com>
Date:   Mon Dec 2 00:53:14 2013 -0500

    Code clean up

commit b176a5b0242c9f65c6ea35c3968bf2ee655843a2
Author: JBaltika <jim@genuineinteractive.com>
Date:   Mon Dec 2 00:46:27 2013 -0500

    cleanup

commit 4ff3c09f2803e839bb3cf6db12a0b38602be1b16
Author: JBaltika <jim@genuineinteractive.com>
Date:   Mon Dec 2 00:42:35 2013 -0500

    Code clean up

commit 5763509f3290f03db13d8899b0fd33f1497d1ecd
Author: JBaltika <jim@genuineinteractive.com>
Date:   Mon Dec 2 00:40:12 2013 -0500

    Clean up