#6 - Refine code