Cleaned up Loader.
Merge pull request #866 from gjersvik/develop

Cleaned up Loader.