review : remove tabs, check indent and add comments