Reformat
Clean up interface