Restructuring (numbered steps getting too messy)