a lot of updating of code formatting