Cleanup lazy loading code.
Merge pull request #36 from InfinitumFramework/lazy-load-fix

Cleanup lazy loading code