code cleanup
formatting