Code optimization
Add comments