Refactoring; starting on summaries