Done fixing and organizing