Correct paths for Windows + cosmetic changes