Cleaning up interfaces a bit as it was getting overwrought.