clean up/ format code