refactor

adding and formating comments