cleanup: + comments and plans