some code formatting +review