working. cosmetic changes, cleaning up code. w00t
working. cosmetic changes, cleaning up code. w00t