Cleaned up pathing