reformat and refactor

tasx-6