Addressing issue #18. Code cleanup.
NetBeans is being goofy again.