Imports clean up.
Added some logging statements.