refine code samples + carry on architecture section