Some minor refactoring.

Basically removed our Interface class.