minor cleanup and org
fixes typo; passes level 2 test