Load works correctly, general cleanup.
Load works correctly, general cleanup.