cleaned up pathing