Reorganize, adding comments