rearranged code, removed comments