Fixed looping issue
More cleanup
Changed to fit new format
Fixed usage