cleaned up a little bit, removed old code that was commented out