Renamed partial file.
Fixed #381. Renamed partial file.
Code cleanup.