Imports cleanup and small changes