cleaned up paths