code cleanup
code formatting changes