neatened into methods