Minor refactors, Logger
Merge branch 'daryl_storage'