Style work, initial work on sharing, refactoring existing code.