Reorganize + comments