cleaning up and make sure paths works