restructure the code and added some comments