Progress towards modular code in history and comments