#17 - Refactor all immediate members.