Fixed: extract methods