reformatting & fix paths