Added Michelle's changes, as well as reformated code to have better style.