Whitespace clean up and if-feature for interface identifier