reorganize + comments