Restructor code and add comments