[#2] Refine codebase