Code cleanup - formatting and imports.