clean up of code formatting