interfaces, cleaning and renaming