Neatened and added HW6