Cleaned up filepath uglyness.