Code review
reformat code and optimized import