Improve organization, move stuff around, comments