*More comments, code reorganization