Code cleanup 2;
aka more interfaces