Cleaning up, fixing pathing