Revise comments & Improve structure