Cleanup, fixing path