05: Restructure code, refine comment
05: Improvements
05: Improvements