Add interface check
Fix indentation