Finish off basic interface, a bit of cleanup