Fix Structure
Improve Structure
Rewrite comments