Imports cleanup, formatting and more TODOs and comments