Code clean-up.
Add logging for loading.