more interface cleanup and whitespace fixes