Interception Stylecop cleanup