ImportableForm
Little bit of clean up, renaming