cleaned code thursday afternoon