Cleaning up part 1, need to test in Windows