Cleaning up code
Improving cleanliness of subsequent load() calls
resolves #5