interface identifier ok and source code refactored
merged
source code refactoring
merged