fix review issues
make the code easier to read