Cleaned up path divider mess