Refactored. Clean up. Moving out things I think people are going to want to change.