code format and adjust paths