Removed most hard-coded refs from homework